From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 20 Jul 2011 16:32:42 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~852^2~9^2~2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=49b602e24ecb3fe085d45ac385e1bfda82252090;p=emacs.git

Merge from trunk.
---

49b602e24ecb3fe085d45ac385e1bfda82252090